ee1452f250c25134d4c518c2caf9acf5045f6fb1,platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java,XmlElementStorage,loadData,#boolean#RoamingType#,138
Before Change
loadDataFromStreamProvider(result, RoamingType.PER_PLATFORM);
}
else if (roamingType != RoamingType.DISABLED) {
loadDataFromStreamProvider(result, roamingType);
}
}
catch (Exception e) {
After Change
StorageData result = createStorageData();
if (useProvidersData && myStreamProvider != null && myStreamProvider.isEnabled()) {
boolean wasLoaded = false;
try {
if (roamingType == null) {
wasLoaded = loadDataFromStreamProvider(result, RoamingType.PER_USER) || loadDataFromStreamProvider(result, RoamingType.PER_PLATFORM);
}
else if (roamingType != RoamingType.DISABLED) {
wasLoaded = loadDataFromStreamProvider(result, roamingType);
}
}
catch (Exception e) {
LOG.warn(e);
}
//noinspection deprecation
if (wasLoaded && !(myStreamProvider instanceof OldStreamProviderAdapter || myStreamProvider instanceof CurrentUserHolder)) {
// we don't use local data if stream provider has one (to preserve backward compatibility, we don't use this logic for old stream providers)
return result;
}